From 0c54d4be128507c8dcc80415dd8a1f61238831a9 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 4 Mar 2002 16:04:31 +0000 Subject: [PATCH] Fix memory leak. (#73370, Paolo Maggi). Mon Mar 4 11:02:18 2002 Owen Taylor * gtk/gtkfilesel.c (gtk_file_selection_get_selections): Fix memory leak. (#73370, Paolo Maggi). --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkfilesel.c | 7 +++++-- 8 files changed, 40 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c2563a1536..5277172def 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Mar 4 11:02:18 2002 Owen Taylor + + * gtk/gtkfilesel.c (gtk_file_selection_get_selections): Fix + memory leak. (#73370, Paolo Maggi). + Mon Mar 4 10:35:28 2002 Owen Taylor * gtk/gtknotebook.c (gtk_notebook_set_current_page): Fix docs diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index c2563a1536..5277172def 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Mon Mar 4 11:02:18 2002 Owen Taylor + + * gtk/gtkfilesel.c (gtk_file_selection_get_selections): Fix + memory leak. (#73370, Paolo Maggi). + Mon Mar 4 10:35:28 2002 Owen Taylor * gtk/gtknotebook.c (gtk_notebook_set_current_page): Fix docs diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c2563a1536..5277172def 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Mon Mar 4 11:02:18 2002 Owen Taylor + + * gtk/gtkfilesel.c (gtk_file_selection_get_selections): Fix + memory leak. (#73370, Paolo Maggi). + Mon Mar 4 10:35:28 2002 Owen Taylor * gtk/gtknotebook.c (gtk_notebook_set_current_page): Fix docs diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c2563a1536..5277172def 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Mon Mar 4 11:02:18 2002 Owen Taylor + + * gtk/gtkfilesel.c (gtk_file_selection_get_selections): Fix + memory leak. (#73370, Paolo Maggi). + Mon Mar 4 10:35:28 2002 Owen Taylor * gtk/gtknotebook.c (gtk_notebook_set_current_page): Fix docs diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c2563a1536..5277172def 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Mon Mar 4 11:02:18 2002 Owen Taylor + + * gtk/gtkfilesel.c (gtk_file_selection_get_selections): Fix + memory leak. (#73370, Paolo Maggi). + Mon Mar 4 10:35:28 2002 Owen Taylor * gtk/gtknotebook.c (gtk_notebook_set_current_page): Fix docs diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c2563a1536..5277172def 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Mon Mar 4 11:02:18 2002 Owen Taylor + + * gtk/gtkfilesel.c (gtk_file_selection_get_selections): Fix + memory leak. (#73370, Paolo Maggi). + Mon Mar 4 10:35:28 2002 Owen Taylor * gtk/gtknotebook.c (gtk_notebook_set_current_page): Fix docs diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c2563a1536..5277172def 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Mon Mar 4 11:02:18 2002 Owen Taylor + + * gtk/gtkfilesel.c (gtk_file_selection_get_selections): Fix + memory leak. (#73370, Paolo Maggi). + Mon Mar 4 10:35:28 2002 Owen Taylor * gtk/gtknotebook.c (gtk_notebook_set_current_page): Fix docs diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c index 06a952c6b2..1d4ccdaecf 100644 --- a/gtk/gtkfilesel.c +++ b/gtk/gtkfilesel.c @@ -681,6 +681,7 @@ gtk_file_selection_init (GtkFileSelection *filesel) list_container = g_object_new (GTK_TYPE_HPANED, "visible", TRUE, "parent", list_hbox, + "border_width", 5, NULL); else list_container = list_hbox; @@ -713,7 +714,7 @@ gtk_file_selection_init (GtkFileSelection *filesel) gtk_container_add (GTK_CONTAINER (scrolled_win), filesel->dir_list); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); - gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 5); + gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 0); if (GTK_IS_PANED (list_container)) gtk_paned_pack1 (GTK_PANED (list_container), scrolled_win, TRUE, TRUE); else @@ -750,7 +751,7 @@ gtk_file_selection_init (GtkFileSelection *filesel) gtk_container_add (GTK_CONTAINER (scrolled_win), filesel->file_list); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); - gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 5); + gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 0); gtk_container_add (GTK_CONTAINER (list_container), scrolled_win); gtk_widget_show (filesel->file_list); gtk_widget_show (scrolled_win); @@ -2372,6 +2373,8 @@ gtk_file_selection_get_selections (GtkFileSelection *filesel) else g_free (current); } + + g_free (dirname); } selections[count] = NULL; -- 2.30.2